treerbtree: Use for loops
authorBenjamin Otte <otte@redhat.com>
Thu, 5 Mar 2020 05:58:44 +0000 (06:58 +0100)
committerBenjamin Otte <otte@redhat.com>
Thu, 5 Mar 2020 06:59:05 +0000 (07:59 +0100)
Makes the code more readable.
Also does the NULL check for the initial element, which was misisng
before.

gtk/gtktreerbtree.c

index 964b6026d103b4e9bf8c10eb53b1bb1b402e84f0..3331d0a5cc3b88ef390e9f94d4a921535e3601ad 100644 (file)
@@ -722,9 +722,9 @@ gtk_tree_rbtree_column_invalid (GtkTreeRBTree *tree)
   if (tree == NULL)
     return;
 
-  node = gtk_tree_rbtree_first (tree);
-
-  do
+  for (node = gtk_tree_rbtree_first (tree);
+       node != NULL;
+       node = gtk_tree_rbtree_next (tree, node))
     {
       if (!(GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_INVALID)))
         GTK_TREE_RBNODE_SET_FLAG (node, GTK_TREE_RBNODE_COLUMN_INVALID);
@@ -733,7 +733,6 @@ gtk_tree_rbtree_column_invalid (GtkTreeRBTree *tree)
       if (node->children)
         gtk_tree_rbtree_column_invalid (node->children);
     }
-  while ((node = gtk_tree_rbtree_next (tree, node)) != NULL);
 }
 
 void
@@ -744,9 +743,9 @@ gtk_tree_rbtree_mark_invalid (GtkTreeRBTree *tree)
   if (tree == NULL)
     return;
 
-  node = gtk_tree_rbtree_first (tree);
-
-  do
+  for (node = gtk_tree_rbtree_first (tree);
+       node != NULL;
+       node = gtk_tree_rbtree_next (tree, node))
     {
       GTK_TREE_RBNODE_SET_FLAG (node, GTK_TREE_RBNODE_INVALID);
       GTK_TREE_RBNODE_SET_FLAG (node, GTK_TREE_RBNODE_DESCENDANTS_INVALID);
@@ -754,7 +753,6 @@ gtk_tree_rbtree_mark_invalid (GtkTreeRBTree *tree)
       if (node->children)
         gtk_tree_rbtree_mark_invalid (node->children);
     }
-  while ((node = gtk_tree_rbtree_next (tree, node)) != NULL);
 }
 
 void
@@ -767,9 +765,9 @@ gtk_tree_rbtree_set_fixed_height (GtkTreeRBTree *tree,
   if (tree == NULL)
     return;
 
-  node = gtk_tree_rbtree_first (tree);
-
-  do
+  for (node = gtk_tree_rbtree_first (tree);
+       node != NULL;
+       node = gtk_tree_rbtree_next (tree, node))
     {
       if (GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_INVALID))
         {
@@ -781,7 +779,6 @@ gtk_tree_rbtree_set_fixed_height (GtkTreeRBTree *tree,
       if (node->children)
         gtk_tree_rbtree_set_fixed_height (node->children, height, mark_valid);
     }
-  while ((node = gtk_tree_rbtree_next (tree, node)) != NULL);
 }
 
 static void